# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/05/24 13:46:19-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/linux-2.4 # into hp.com:/home/helgaas/linux/ia64-extras # # arch/i386/kernel/setup.c # 2004/05/24 13:46:18-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Documentation/Configure.help # 2004/05/24 13:46:18-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/05/22 22:53:39-04:00 len.brown@intel.com # [ACPI] x86_64 + ACPI + IOAPIC + PCI Interrupt Link -> IRQ 0 # from Andy Currid # # arch/x86_64/kernel/mpparse.c # 2004/05/20 20:00:00-04:00 len.brown@intel.com +0 -2 # x86_64 + ACPI + IOAPIC + PCI Interrupt Link -> IRQ 0 # from Andy Currid # # ChangeSet # 2004/05/22 18:57:07-03:00 romieu@fr.zoreil.com # [PATCH] CPUID Pentium-4E update and missing new line # # - cache size format for Intel P4E (p.26 of doc. 241618-025, "Intel # Processor Identification and the CPUID Instruction"); # - missing end of line. # # arch/i386/kernel/setup.c # 2004/05/22 16:34:25-03:00 romieu@fr.zoreil.com +3 -0 # CPUID Pentium-4E update and missing new line # # ChangeSet # 2004/05/21 20:18:17-03:00 Emoore@lsil.com # [PATCH] MPT Fusion driver 2.05.16 update # # Changelog for 2.05.16, Release Date: March 17, 2004 # # (1) SDTR/WDTR Disallow bits were not being set # in Device Configuration Page 1 for SEP devices. # (2) Increase the timeout in RAID Action Request # from 2 to 10 seconds. Under stress conditions, the # QUIESCE_PHYS_IO action request was taking longer # than 2 seconds timeout to complete, thus resulting # in the driver going into a host bus reset. # (3) Replace sys_ioctl with our own defined function # compat_mptctl_ioctl. This removes the warning messages. # # -------------------------------------------------- # # # Changelog for 2.05.15, Release Date: March 16, 2004 # # (1) Processing of an IOCStatus of # MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH was changed to # allow the OS SCSI layer to retry the command. # (2) Firmware upload and downloadboot was # simplified to match the algorithms in the MPI 1.2 spec. # # -------------------------------------------------- # # # Changelog for 2.05.14, Release Date: March 8, 2004 # # (1) Search IOCPage3 for Id being a physical drive # of a volume. If so, don't include its information in # Ioctl TargetInfo data. # (2) Default to QAS before checking for QAS capable # in inquiry data. This allows Ultra320 drives to # operate with QAS in SuSE systems. # # -------------------------------------------------- # # Changelog for 2.05.13, Release Date: Feb 20, 2004 # # (1) Read IOCPage2 and IOCPage3 on each Ioctl # TargetInfo request. Prevents stale data from being # used if volume is changed while the driver is operational # (via Ioctl interface). # (2) Extend time to at least 5 seconds for Doorbell # Interrupt and Ack checks. # (3) Allow Check Conditions to take precedence over # data length checks in DATA_UNDERRUN error processing. # # -------------------------------------------------- # # Changelog for 2.05.12, Release Date: Feb 6, 2004 # # # (1) The driver now supports the FC929XL. # (2) The driver now supports I2C requirements. # Toolbox message generation and processing has been # added to IOCTL processing. # (3) Rpm and DUD files are now available for # Redhat 3.0 on ia64 machines. # (4) Added code to check for QAS enabled or disabled # in SCSI Port Page 0. Ultra 320 negotiations will reflect # the QAS setting in SCSI Port Page 0. # (5) Added code to obtain IOC Page 2 data in order to # provide Volume data in Target Info Data returned by an IOCTL # request. # (6) Fixed Target Info code to prevent overrunning the # data buffer length provided by the application. Also fixed # that code to include checking for the last id on the IOC. # (7) Added code in the data underrun response processing # to return an error code if no data was transferred. # (9) Added code to properly set each device's queue_depth # for Fibre Channel devices. # (10) Fixed code to allow Ioctl operation on ia64 machines. # (11) Performance enhancements were made. # # drivers/message/fusion/scsi3.h # 2004/03/15 05:15:17-03:00 Emoore@lsil.com +1 -1 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptscsih.h # 2004/03/15 05:15:17-03:00 Emoore@lsil.com +1 -1 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptscsih.c # 2004/03/16 15:02:00-03:00 Emoore@lsil.com +153 -204 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptlan.c # 2004/03/15 05:15:17-03:00 Emoore@lsil.com +1 -1 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptctl.h # 2004/03/15 05:15:17-03:00 Emoore@lsil.com +1 -1 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptctl.c # 2004/03/16 15:08:12-03:00 Emoore@lsil.com +97 -51 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptbase.h # 2004/03/16 17:00:16-03:00 Emoore@lsil.com +42 -15 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/mptbase.c # 2004/05/21 20:17:51-03:00 Emoore@lsil.com +408 -546 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_type.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +3 -3 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_tool.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +179 -3 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_targ.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +2 -2 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_sas.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +181 -0 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_raid.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +3 -3 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_lan.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +3 -3 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_ioc.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +74 -10 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_init.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +42 -4 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_fc.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +5 -4 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_cnfg.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +502 -28 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +99 -37 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/isense.c # 2004/03/15 05:15:17-03:00 Emoore@lsil.com +1 -1 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_sas.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/message/fusion/lsi/mpi_sas.h # # drivers/message/fusion/lsi/mpi_inb.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +220 -0 # MPT Fusion driver 2.05.16 update # # drivers/message/fusion/lsi/mpi_inb.h # 2004/04/26 18:19:24-03:00 Emoore@lsil.com +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/message/fusion/lsi/mpi_inb.h # # ChangeSet # 2004/05/21 17:37:55-03:00 green@linuxhacker.ru # [PATCH] Fix possible memleaks in VIA IrDA driver # # Patch below fixes some possible memleaks in VIA IrDA driver, also # checks for skb->data being non-NULL are dropped since alloc_skb # cannot return such skbs as far as I can see. # # ===== drivers/net/irda/via-ircc.c 1.3 vs edited ===== # # drivers/net/irda/via-ircc.c # 2004/05/09 12:01:34-03:00 green@linuxhacker.ru +20 -9 # Fix possible memleaks in VIA IrDA driver # # ChangeSet # 2004/05/21 14:46:24-03:00 dlsy@snoqualmie.dp.intel.com # [PATCH] Documentation for new PCI hotplug drivers # # Here is the patch for the Config.help file. # I saw someone sent out a patch yesterday, but it didn't include the # information regarding compilng the drivers as modules. # # Documentation/Configure.help # 2004/05/20 07:55:08-03:00 dlsy@snoqualmie.dp.intel.com +40 -0 # Documentation for new PCI hotplug drivers # # ChangeSet # 2004/05/21 13:01:41-03:00 trond.myklebust@fys.uio.no # [PATCH] NFS client: Fix sillydelete() # # Ensure that sillydelete waits upon completion unless the user killed the # task. # Also fix an NFSv3 alignment problem on 64-bit architectures. # # Cheers, # Trond # # dir.c | 8 +++++++- # unlink.c | 13 ++++++++++++- # 2 files changed, 19 insertions(+), 2 deletions(-) # # fs/nfs/unlink.c # 2004/04/16 13:35:23-03:00 trond.myklebust@fys.uio.no +12 -1 # NFS client: Fix sillydelete() # # fs/nfs/dir.c # 2004/04/16 13:35:23-03:00 trond.myklebust@fys.uio.no +7 -1 # NFS client: Fix sillydelete() # # ChangeSet # 2004/05/20 17:51:19-03:00 marcelo@logos.cnet # ext3_read_super: remove [un]lock_super (Andrew Morton) # # The VFS no longer holds lock_super() across ->read_super(), so we don't need # this code any more. # # fs/ext3/super.c # 2004/05/20 17:50:09-03:00 marcelo@logos.cnet +0 -10 # ext3_read_super: remove [un]lock_super # The VFS no longer holds lock_super() across ->read_super(), so we don't need # this code any more. # # ChangeSet # 2004/05/20 15:38:13-05:00 shaggy@austin.ibm.com # JFS: [CHECKER] if txCommit fails, don't call d_instantiate # # In several functions, d_instantiate is called before the transaction # is committed. Under the rare condition that txCommit fails, the new # inode is released, but the dentry continues to point to it. This # can lead to a seg fault. The fix is to call d_instantiate after # txCommit has run successfully. # # fs/jfs/namei.c # 2004/05/20 15:38:10-05:00 shaggy@austin.ibm.com +10 -9 # Don't d_instantiate new dentrys if txCommit fails # # ChangeSet # 2004/05/20 16:52:56-03:00 Michael.Waychison@Sun.COM # [PATCH] cramfs use pagecache # # We recently hit a problem when we wanted to have both cramfs and minix # support built-in. If we tried to mount a minix filesystem from ramdisk, # depending on link order, cramfs would be tried first, and it would # invalidate the pagecache in an attempt to set_blocksize. # # This is a v2.4 backport of Al Viro's v2.6 fix. # # fs/cramfs/inode.c # 2004/04/16 09:48:42-03:00 Michael.Waychison@Sun.COM +27 -25 # cramfs use pagecache # # ChangeSet # 2004/05/20 16:46:53-03:00 bunk@fs.tum.de # [PATCH] SCSI ips compile error # # On Tue, May 18, 2004 at 05:30:40PM -0300, Marcelo Tosatti wrote: # >... # > Summary of changes from v2.4.27-pre2 to v2.4.27-pre3 # > ============================================ # >... # > Jack Hammer: # > o ServeRAID driver update to 7.00.15: sync with v2.6 # >... # # It was nice if people would actually test at least the compilation of # their changes instead of blindly submitting the latest version of a # driver... # # <-- snip --> # # ... # gcc -D__KERNEL__ # -I/home/bunk/linux/kernel-2.4/linux-2.4.27-pre3-full/include -Wall # -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common # -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=athlon # -nostdinc -iwithprefix include -DKBUILD_BASENAME=ips -c -o ips.o ips.c # In file included from ips.c:180: # ips.h:99: error: redefinition of `irqreturn_t' # /home/bunk/linux/kernel-2.4/linux-2.4.27-pre3-full/include/linux/interrupt.h:16: # error: `irqreturn_t' previously declared here # make[3]: *** [ips.o] Error 1 # make[3]: Leaving directory `/home/bunk/linux/kernel-2.4/linux-2.4.27-pre3-full/drivers/scsi' # # <-- snip --> # # # irqreturn_t was added to interrupt.h in 2.4.23, released nearly # 6 months (!) ago. # # Trivial fix below. # # cu # Adrian # # drivers/scsi/ips.h # 2004/05/19 16:42:01-03:00 bunk@fs.tum.de +4 -1 # SCSI ips compile error # # ChangeSet # 2004/05/20 14:29:32-05:00 shaggy@austin.ibm.com # JFS: [CHECKER] Dereference of NULL pointer if alloc_metapage fails # # fs/jfs/jfs_metapage.c # 2004/05/20 14:29:29-05:00 shaggy@austin.ibm.com +5 -1 # It's unlikely, but alloc_metapage can fail. # # ChangeSet # 2004/05/20 15:12:00-03:00 ak@suse.de # [PATCH] Fix pageattr cache flushing on P4 (thanks to Terence Ripperda) # # This fixes a long standing bug in the 2.4 version of pageattr. When GART remapping # is involved the self snoop capability of the Pentium 4 cannot always prevent # cache corruptions from illegal cache aliases. # # The previous code assumed that SS would make the need for the cache flush obsolete, # but that wasn't always the case. # # Just make the P4 always flush the caches in change_page_attr() too. # # Thanks goes to Terence Ripperda for tracking this down. # # arch/i386/mm/pageattr.c # 2004/05/19 06:03:47-03:00 ak@suse.de +3 -5 # Fix pageattr cache flushing on P4 (thanks to Terence Ripperda) # # ChangeSet # 2004/05/20 10:03:58-05:00 shaggy@austin.ibm.com # JFS: [CHECKER] Memory leak on commonly executed path # # The jfs_log structure was never being freed at unmount time. # # fs/jfs/jfs_logmgr.c # 2004/05/20 10:03:52-05:00 shaggy@austin.ibm.com +1 -0 # Free log in lmLogClose # # ChangeSet # 2004/05/19 10:47:17-05:00 shaggy@austin.ibm.com # JFS: Make sizes of tid_t & lid_t consistent # # tlocks and linelocks were using different sizes for "next". They # need to be consistent. # # fs/jfs/jfs_types.h # 2004/05/19 10:47:15-05:00 shaggy@austin.ibm.com +6 -3 # lid_t & tid_t should be 16 bits. # # fs/jfs/jfs_txnmgr.h # 2004/05/19 10:47:15-05:00 shaggy@austin.ibm.com +9 -9 # lid_t & tid_t should be 16 bits. # # ChangeSet # 2004/05/19 10:14:20-05:00 shaggy@austin.ibm.com # JFS: Don't return -EPERM for system xattrs. # # Thanks Andreas Gruenbacher # # fs/jfs/xattr.c # 2004/05/19 10:14:16-05:00 shaggy@austin.ibm.com +2 -0 # Even without posix acls enabled, getxattr should not return -EPERM # for system.* xattrs. # # ChangeSet # 2004/05/18 15:25:22-05:00 shaggy@austin.ibm.com # JFS: error in __get_metapage caused by invalid size from ea_get # # fs/jfs/xattr.c # 2004/05/18 15:25:20-05:00 shaggy@austin.ibm.com +2 -1 # ea_get calling read_metapage with wrong size # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help 2004-05-24 15:13:40 -07:00 +++ b/Documentation/Configure.help 2004-05-24 15:13:40 -07:00 @@ -18680,6 +18680,11 @@ purpose port, say Y here. See <http://www.dig64.org/specifications/DIG64_HCDPv10a_01.pdf>. +Support for serial ports defined in ACPI namespace +CONFIG_SERIAL_ACPI + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + Support for PowerMac serial ports CONFIG_MAC_SERIAL If you have Macintosh style serial ports (8 pin mini-DIN), say Y